Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(x/mint, x/gamm errors): move errors in mint and gamm keeper to errors.go (backport #2067) #2130

Merged
merged 1 commit into from
Jul 20, 2022
Merged

refactor(x/mint, x/gamm errors): move errors in mint and gamm keeper to errors.go (backport #2067) #2130

merged 1 commit into from
Jul 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2022

This is an automatic backport of pull request #2067 done by Mergify.
Cherry-pick of e5ffb81 has failed:

On branch mergify/bp/v10.x/pr-2067
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit e5ffb813.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x/gamm/pool-models/balancer/amm.go
	modified:   x/gamm/pool-models/balancer/export_test.go
	modified:   x/gamm/types/errors.go
	new file:   x/mint/types/errors.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x/gamm/pool-models/balancer/pool.go
	deleted by us:   x/mint/keeper/export_test.go
	both modified:   x/mint/keeper/keeper.go
	both modified:   x/mint/keeper/keeper_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team July 18, 2022 22:46
@mergify mergify bot added the conflicts label Jul 18, 2022
@github-actions github-actions bot added C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint labels Jul 18, 2022
@p0mvn p0mvn marked this pull request as draft July 19, 2022 18:40
@stackman27 @p0mvn
refactor(x/mint, x/gamm errors): move errors in mint and gamm keeper …
dda9222 
…to errors.go (#2067)

* moved mint errors

* errors formatted

* rom and bez feedback

* rebased

* addressed all comments

(cherry picked from commit e5ffb81)
@p0mvn p0mvn force-pushed the mergify/bp/v10.x/pr-2067 branch from e8dc074 to dda9222 Compare July 20, 2022 00:59
@p0mvn p0mvn marked this pull request as ready for review July 20, 2022 01:00
@p0mvn p0mvn merged commit 301c664 into v10.x Jul 20, 2022
@p0mvn p0mvn deleted the mergify/bp/v10.x/pr-2067 branch July 20, 2022 01:15
mattverse added a commit that referenced this pull request Aug 1, 2022
@mattverse
Revert "refactor(x/mint, x/gamm errors): move errors in mint and gamm…
2d31d6c 
… keeper to errors.go (#2067) (#2130)"

This reverts commit 301c664.
@github-actions github-actions bot mentioned this pull request Apr 1, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@p0mvn p0mvn p0mvn approved these changes

Assignees

@stackman27 stackman27

Labels
C:x/gamm Changes, features and bugs related to the gamm module. C:x/mint conflicts
Projects
Osmosis Chain Development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@p0mvn @stackman27